Auto merge of #3956 - jessicah:update-num-cpus-dep, r=alexcrichton
authorbors <bors@rust-lang.org>
Wed, 26 Apr 2017 03:32:21 +0000 (03:32 +0000)
committerbors <bors@rust-lang.org>
Wed, 26 Apr 2017 03:32:21 +0000 (03:32 +0000)
commitf41cb68694fddc9c8f76d9b97c740f054d70428d
tree429b6144a42776ac1b8e454c43355f402ab0ac91
parent6c510b06314150b58dd6873685f9420a508658ca
parentf463e3c747a0adc60e51fd151de4d698597e1e1b
Auto merge of #3956 - jessicah:update-num-cpus-dep, r=alexcrichton

Update num_cpus to 1.4.0 (adds support for Haiku)

This will bring it inline with rustc: https://github.com/rust-lang/rust/pull/41552